Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim

1 files changed, 62 insertions, 138 deletions

diff --git a/app/[lng]/partners/(partners)/document-list-ship/page.tsx b/app/[lng]/partners/(partners)/document-list-ship/page.tsx
index c70a0c03..9ce7c6c6 100644
--- a/app/[lng]/partners/(partners)/document-list-ship/page.tsx
+++ b/app/[lng]/partners/(partners)/document-list-ship/page.tsx
@@ -1,145 +1,69 @@
-// page.tsx (간단한 Promise 생성과 로그인 처리)
-import * as React from "react"
-import { type SearchParams } from "@/types/table"
-import { getValidFilters } from "@/lib/data-table"
-import { Skeleton } from "@/components/ui/skeleton"
-import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
-import { Shell } from "@/components/shell"
-import { searchParamsShipDocuCache } from "@/lib/vendor-document-list/validations"
-import { getServerSession } from "next-auth"
-import { authOptions } from "@/app/api/auth/[...nextauth]/route"
-import Link from "next/link"
-import { Button } from "@/components/ui/button"
-import { LogIn } from "lucide-react"
-import { getUserVendorDocumentStats, getUserVendorDocuments } from "@/lib/vendor-document-list/enhanced-document-service"
-import { UserVendorDocumentDisplay } from "@/components/ship-vendor-document/user-vendor-document-table-container"
-import { InformationButton } from "@/components/information/information-button"
-interface IndexPageProps {
-    searchParams: Promise<SearchParams>
-}
-
-export default async function IndexPage(props: IndexPageProps) {
-    const searchParams = await props.searchParams
-    const search = searchParamsShipDocuCache.parse(searchParams)
-    const validFilters = getValidFilters(search.filters)
-
-    // Get session
-    const session = await getServerSession(authOptions)
-
-    // Check if user is logged in
-    if (!session || !session.user) {
-        return (
-            <Shell className="gap-6">
-                <div className="flex items-center justify-between">
-                    <div>
-                        <div className="flex items-center gap-2">
-                            <h2 className="text-2xl font-bold tracking-tight">
-                                문서 관리
-                            </h2>
-                        </div>
-                        {/* <p className="text-muted-foreground">
-                            소속 회사의 모든 도서/도면을 확인하고 관리합니다.
-                        </p> */}
-                    </div>
-                </div>
-
-                <div className="flex flex-col items-center justify-center py-12 text-center">
-                    <div className="rounded-lg border border-dashed p-10 shadow-sm">
-                        <h3 className="mb-2 text-xl font-semibold">로그인이 필요합니다</h3>
-                        <p className="mb-6 text-muted-foreground">
-                            문서를 확인하려면 먼저 로그인하세요.
-                        </p>
-                        <Button size="lg" asChild>
-                            <Link href="/partners">
-                                <LogIn className="mr-2 h-4 w-4" />
-                                로그인하기
-                            </Link>
-                        </Button>
-                    </div>
-                </div>
-            </Shell>
-        )
-    }
-
-    // User is logged in, get user ID
-    const requesterId = session.user.id ? Number(session.user.id) : null
+import { Suspense } from "react";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import DolceUploadPageV2 from "./dolce-upload-page-v2";
+import { Shell } from "@/components/shell";
 
-    if (!requesterId) {
-        return (
-            <Shell className="gap-6">
-                <div className="flex items-center justify-between">
-                    <div>
-                        <h2 className="text-2xl font-bold tracking-tight">
-                        Document Management
-                        </h2>
-                    </div>
-                </div>
-                <div className="flex flex-col items-center justify-center py-12 text-center">
-                    <div className="rounded-lg border border-dashed p-10 shadow-sm">
-                        <h3 className="mb-2 text-xl font-semibold">계정 오류</h3>
-                        <p className="mb-6 text-muted-foreground">
-                            사용자 정보가 올바르게 설정되지 않았습니다. 관리자에게 문의하세요.
-                        </p>
-                    </div>
-                </div>
-            </Shell>
-        )
-    }
+export const metadata = {
+  title: "조선 벤더문서 업로드(DOLCE) V2",
+  description: "조선 설계문서 업로드 및 관리 - 분할 레이아웃",
+};
 
-    // 검색 파라미터 정리
-    const searchInput = {
-        ...search,
-        filters: validFilters,
-    }
+// ============================================================================
+// 로딩 스켈레톤
+// ============================================================================
 
-    // Promise 생성 (모든 데이터를 페이지에서 처리)
-    const documentsPromise = getUserVendorDocuments(requesterId, searchInput)
-    const statsPromise = getUserVendorDocumentStats(requesterId)
-    
-    // Promise.all로 감싸서 전달
-    const allPromises = Promise.all([documentsPromise, statsPromise])
-
-    const statsResult = await documentsPromise
-    const vendorName = statsResult.vendorInfo?.vendorName || "내 회사"
-
-
-    return (
-        <Shell className="gap-2">
-            <div className="flex items-center justify-between space-y-2">
-                <div>
-                    <div className="flex items-center gap-2">
-                    <h2 className="text-2xl font-bold tracking-tight">
-                    {vendorName} Document Management
-                    </h2>
-                    <InformationButton pagePath="partners/document-list-ship" />
-                    </div>
-
-                    <p className="text-muted-foreground">
-                  
-                    </p>
-                </div>
-            </div>
+function DolceUploadSkeleton() {
+  return (
+    <div className="space-y-4">
+      <Card>
+        <CardHeader>
+          <Skeleton className="h-8 w-48" />
+        </CardHeader>
+        <CardContent>
+          <Skeleton className="h-32 w-full" />
+        </CardContent>
+      </Card>
+      <Card>
+        <CardHeader>
+          <Skeleton className="h-8 w-48" />
+        </CardHeader>
+        <CardContent>
+          <Skeleton className="h-96 w-full" />
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
 
-            <React.Suspense fallback={<Skeleton className="h-7 w-52" />}>
-                {/* DateRangePicker can go here */}
-            </React.Suspense>
+export default async function DolceUploadPageWrapper({
+  params,
+  searchParams,
+}: {
+  params: Promise<{ lng: string }>;
+  searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
+}) {
+  const { lng } = await params;
+  const resolvedParams = await searchParams;
+  
+  return (
+    <Shell variant="fullscreen">
+      {/* 헤더 */}
+      <div className="flex items-center justify-between flex-shrink-0">
+        <div>
+          <h2 className="text-2xl font-bold tracking-tight">
+            {lng === "ko" 
+              ? "조선 도면 업로드" 
+              : "Shipbuilding Drawing Upload"}
+          </h2>
+        </div>
+      </div>
 
-            <React.Suspense
-                fallback={
-                    <DataTableSkeleton
-                        columnCount={8}
-                        searchableColumnCount={1}
-                        filterableColumnCount={3}
-                        cellWidths={["10rem", "30rem", "15rem", "15rem", "15rem", "15rem", "8rem", "8rem"]}
-                        shrinkZero
-                    />
-                }
-            >
-                <UserVendorDocumentDisplay
-                    allPromises={allPromises}
-                />
-            </React.Suspense>
-        </Shell>
-    )
+      {/* 메인 컨텐츠 */}
+      <Suspense fallback={<DolceUploadSkeleton />}>
+        <DolceUploadPageV2 searchParams={resolvedParams} />
+      </Suspense>
+    </Shell>
+  );
 }